From: Florian Müllner <fmuellner@gnome.org>
Date: Fri, 29 Nov 2024 00:21:02 +0000 (+0100)
Subject: tools/toolbox: Work around systemd issue
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~173^2^2~142
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=4cff5e4572c02deffced1917bfbd56b443580581;p=gnome-shell.git

tools/toolbox: Work around systemd issue

systemd-sysext currently messes up SElinux labeling[0].

As a workaround, we can delegate to the systemd-sysext service
that doesn't exercise the same issue.

[0] https://github.com/systemd/systemd/issues/34387

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3498>
---

diff --git a/tools/toolbox/toolbox-sysext-install.sh b/tools/toolbox/toolbox-sysext-install.sh
index 0ff3b659a..6310fb00e 100755
--- a/tools/toolbox/toolbox-sysext-install.sh
+++ b/tools/toolbox/toolbox-sysext-install.sh
@@ -64,7 +64,9 @@ install_command() {
 }
 
 sysext_merge_command() {
-  echo -n systemd-sysext refresh
+  #echo -n systemd-sysext refresh
+  # workaround for https://github.com/systemd/systemd/issues/34387
+  echo -n systemctl restart systemd-sysext.service
 }
 
 compile_schemas_command() {